Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 197c32dc5b am: 5365831dfb am: edf83fea0f

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

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