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