Merge "Merge remote-tracking branch 'aosp/upstream-main' into uprev" into main am: a8ef39578c

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

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