Merge "drm_hwcomposer: Merge remote-tracking branch 'aosp/upstream-main' into HEAD"