[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 6dc15689 -s ours

am skip reason: Merged-In I9be1254c3e2685b0aa950b314c581824f40ce26c with SHA-1 85e62f11 is already in history

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



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