[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L55300030005690752:N74900030088923708" into aosp-main-future am: bdbd648d -s ours

am skip reason: Merged-In I50fd932a8e61196eda66c074eb2f8089e455b515 with SHA-1 a0ad8aa1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28660588



Change-Id: I9ce6f7e0b2c0f5ec1d3c5e10837b353f22c2cb24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>