Merge "drm_hwcomposer: Merge remote-tracking branch 'aosp/upstream-main' into HEAD" am: bc74646e90 am: b52fbe0ff4 am: b8f24097f2 am: 0ce3610105 am: 42f13403a2

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

Change-Id: I413043cea5d03147ddeb81ec48b4859ac41a8262