Merge upstream-main into main am: 018f7ff8fa am: d7bbfc10d3

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

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