[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L02700030003994830:N86200030063687325" into main am: 6ff81b10 am: 3aadebe4 -s ours

am skip reason: Merged-In Id2b620088e12266f041be864271493ffe7e1a3b1 with SHA-1 60e4fdfa is already in history

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



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