Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21282394 Change-Id: Id9437ef2c22f04ac37782214a41da52a9a8bf107 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>