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