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

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

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