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