drm_hwcomposer: Merge 'aosp/upstream-main' into HEAD am: a393df4bcf am: cdc4ed6c83

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

Change-Id: Ia04a958d5b828e86080125b8d378bf618e71be5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>