[automerger skipped] Merge changes If05d11a0,Ie67f0141 into...

[automerger skipped] Merge changes If05d11a0,Ie67f0141 into android15-tests-dev am: ef5149b0 -s ours am: bf7d9ad0 -s ours

am skip reason: Merged-In If05d11a0a884294896223aedd79d7f689380dc58 with SHA-1 06f58c06 is already in history

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



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