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