Merge remote-tracking branch 'aosp/upstream-main' into aosp am: 2d55f2ba2a

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

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