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

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

Change-Id: I302491d47346aa48eebcac6498991fda95f62b58