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