drm_hwcomposer: Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 774e5e3432 am: 24ccb88ece am: 42f5da5192

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

Change-Id: Iae3684f162cd9e86a0feca58480a2dbcf3f450fe