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

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

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