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