Merge remote-tracking branch 'aosp/upstream-main' am: 197d810946 am: 105245d6e3

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

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