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

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

Change-Id: I312356facb8fac168d1af22615c3c56877470fa9