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

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

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