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