[automerger skipped] Merge 24Q4 into AOSP main am: 2cb09d0 -s ours am: d289431 -s ours

am skip reason: Merged-In I5ed05d0f5aa4c5e98fbd9b5275f3db39ccb76fed with SHA-1 28c21c6 is already in history

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

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

Author: delphij