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

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

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