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