Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: a93cbdde8f

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

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