Merge remote-tracking branch 'aosp/upstream-main' am: 4911dcf54c

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

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