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