[automerger skipped] Merge 24Q4 into AOSP main am: 2cb09d0 -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/+/3413626

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

Author: delphij