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