[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L56400030010015106:N36200030169426477" into android15-tests-dev am: a951475a -s ours am: 64bad69e -s ours

am skip reason: Merged-In I95c5f29ecc3af5d3ab0b66f168eef9531f9e0aaa with SHA-1 343928da is already in history

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



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