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

am skip reason: Merged-In I30f4c21dfee68603d0dad01d205f8a5581e6db31 with SHA-1 4fc32e04 is already in history

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



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