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