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