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