Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 97b4f2559e am: 6e792d7aa5 am: fc030f53a5 am: b038ca0b70

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

Change-Id: I158aeece6bbfc33e681f5b8f1fa7df05d11e4c1a