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

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

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