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