Merge remote-tracking branch 'aosp/upstream-main' into merge-from-upstream am: d2bab9a7eb

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

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