Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: c707da598c

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

Change-Id: Ie6cff7b500fe023f0543bde86d4f3ffec9954727