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