Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20880908



Change-Id: I041169bd6e1be65c9234a5b333287368a157de81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>