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