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

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

Change-Id: I9af04f744fc170a4cc4d6cf35fe356f8302f2e80