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