Merge remote-tracking branch 'aosp/upstream-main' am: a394318df6

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

Change-Id: I7c15780aff431bb247e351dab5d2cf01118298ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>