Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 8e7afb9d2e

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

Change-Id: Ic994bd8c102ab9694cc255949d79ad21aad4e832