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