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

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

Change-Id: Ie31c6953a009a03da4a616dc0dc34c16d1778737