Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 97b4f2559e am: 6e792d7aa5

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

Change-Id: I3861fb091fb45c0cd3b00a7267cc43c57f4b9a2c