Merge "Merge remote-tracking branch 'aosp/upstream-main' into HEAD" into main am: 2bf1995043

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

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