Merge branch 'aosp/master' into 'aosp/android10-gsi'

... to update Minigbm for Cuttlefish to support Gralloc 3
and Gralloc 4.

Bug: b/157902551
Test: launch_cvd
Test: launch_cvd --gpu_mode=drm_virgl
Change-Id: I4e88b2be55763a4b47929cce2e095cf49ff1f4bd