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