Merge remote-tracking branch 'gitlab/main' into HEAD am: 84fa73c0d4 am: 82288efb3a am: 469d0d5452

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

Change-Id: Ib711a939454ada9dfce6daa3ae7db451888e7be7