drm_hwcomposer: Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 38163fdedc

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

Change-Id: I97b4652389ac4dd30b56e7992431a1cf831e73c7