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