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

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

Change-Id: Ib7857c5777eaef68e5379f94c0b9432271e49807