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

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

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