[automerger skipped] Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into...

[automerger skipped] Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into aosp-main-future am: 46b645ec -s ours

am skip reason: Merged-In I668022c2d567a188917754d1482f227dec84dc46 with SHA-1 a7d4027e is already in history

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



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