minigbm: Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: db90701156 am: d6e2d52a38

Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/1908214

Change-Id: I77db96153213f7f2a02aec7bff3e300f5724c8e8