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