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

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

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