[automerger skipped] Merge 24Q4 into AOSP main am: e093033edc -s ours am: 037b9310cb -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/+/3401939

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