Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: cbb60e01ac

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

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