Merge "Merge remote-tracking branch 'aosp/upstream-main' into 'aosp/master'" am: dbfe7bab6e am: ea466a11e7 am: fb7cc9625f am: 44eb7ad089

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

Change-Id: Ic6b13a66f5426200504e441ea136ab1a674d26eb