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