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