drm_hwcomposer: Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 38163fdedc am: ecb41b1fdc am: 197ccc9866 am: a976c15a02 am: a07ba4ed65

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

Change-Id: I1d699a299cc430af97fb3ddd937d5ed1f0e4f9b7