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

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

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