Merge remote-tracking branch 'aosp/upstream-main' into 'aosp/master' am: e6295d18ec

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

Change-Id: I0e856981f1fcd3068af68015c9cd20350f011166