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