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