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

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

Change-Id: Iced792dce3000fd04d45fd1924409506376e97bf