Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 am: 0db9b974c2 am: bde967aa74
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164 Change-Id: I849a4eb13be06383dd40f2f4ccf0643c5db099b5
This commit is contained in: