Merge branch 'aosp/upstream-main' into 'aosp/master'

... to update Minigbm for Cuttlefish to pull in fix for XBGR format
layout from https://crrev.com/c/3414504

Bug: b/216316318
Test: launch_cvd --gpu_mode=guest_swiftshader
Test: launch_cvd --gpu_mode=gfxstream
Change-Id: Iee7e6da7f27de9ea3968d9615a1a859bddd6d117