Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 0bc25bbaab am: 69d430343b

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

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