Merge remote-tracking branch 'gitlab/main' into HEAD am: 84fa73c0d4

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

Change-Id: I2f79b8d88dd378050c41cd982153e290445c0fa1