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

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

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