drm_hwcomposer: Merge 'aosp/upstream-main' into HEAD am: cd31422280 am: 5944fd14ed am: 9a34e46f1b

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

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