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