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

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

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