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