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