Merge upstream-main into main am: 018f7ff8fa

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

Change-Id: I6dd1731c05063fac82c0c3649cd9f190bb9caf23
Signed-off-by: Automerger Merge Worker <[email protected]>