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

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

Change-Id: I37a663ac93440f53997901cbd91895b6e9c8a99d