Merge "Address unit test failures" into sc-dev am: 5271d95ce4 am: 8648cc7b4a am: 00adc49f32
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14940264 Change-Id: I8190e9a42b5b9da49c6354f5c42b863780832dfd
This commit is contained in: