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

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

Change-Id: I33f5a283c3a5f2a3c22326a7c7e4b91f80b936f5