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