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

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

Change-Id: I24d3d0f4a5cd474ec13158126b644eac00025d0f