Merge remote-tracking branch 'aosp/upstream-main' into uprev_drm_hwc am: 1c44556c79

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

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