Merge changes I6dd829f4,Id8384c58,I9228b9cc,I744a1e89 into sc-dev am: 03dff71bd8 am: 63db607211
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14212412 Change-Id: I172bf8cd582e4581fc98c5e60a3504c198db5084
This commit is contained in: