Merge remote-tracking branch 'gitlab/main' into backmerge_2024-11-13 am: 587224dd65

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

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