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