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