[automerger skipped] Merge changes from topic "2024-06-19-aosp-future-cp" into...

[automerger skipped] Merge changes from topic "2024-06-19-aosp-future-cp" into aosp-main-future am: 0a8c338b -s ours

am skip reason: Merged-In I7c13021f539a38b3eb493ddbf3c04eadd5d8ef81 with SHA-1 d017c334 is already in history

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



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