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