Merge "drm_hwcomposer: Merge remote-tracking branch 'aosp/upstream-main' into HEAD" am: bc74646e90 am: b52fbe0ff4

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

Change-Id: Ib5da17b7bcc3634a702eac2a3ee1deaec4c8b65b