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