Merge changes I5cbfcc73,I3070b3f3 into udc-dev am: 75c1b88603 am: 486c57f783 am: eb72b1dfe4
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23094536 Change-Id: Iffb092e3d0967b5f3eb790911e6ac11636f35a42 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: