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

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

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