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

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

Change-Id: I1ba7f56aa6039b1ebedbb991c34af8465346e78c