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