Merge remote-tracking branch 'aosp/upstream-main' into uprev am: 39c1270fad

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

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