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