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