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