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