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