[automerger skipped] Merge changes I47e07f87,I9f3542d6,I3c5cae3f into 24D1-dev am: bab84f3277 -s ours

am skip reason: Merged-In I47e07f87242273bd6463b01783c4b9fafa97e391 with SHA-1 93ca7c45c2 is already in history

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

Change-Id: If0561b3edd1c990c3eeacb1ad20dada3a8f3d21d
Signed-off-by: Automerger Merge Worker <[email protected]>