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

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

Change-Id: I4a6988772707a76eceb46fb8fe51ac7d72a7a01a