[automerger skipped] Merge 24Q4 into AOSP main am: e093033edc -s ours

am skip reason: Merged-In Ief7c19248fdd739e17c54335a3c234aa9dd3677e with SHA-1 bb9f3ea693 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/3413783

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