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