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

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

Change-Id: I74fbf209afc31b56a35380946c6c27142e3b194d