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

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

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