Merge "drm_hwcomposer: Merge remote-tracking branch 'aosp/upstream-main' into HEAD" am: 6ca311696d am: cdf90f5669 am: fb30bcf225

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

Change-Id: I47e757287b79d8a4524db06f0e3ab3715f20eef4