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