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

... to update Minigbm for Cuttlefish to support Gralloc3
on Minigbm.

Bug: b/157902551
Test: m && launch_cvd --gpu_mode=gfxstream
Test: m && launch_cvd --gpu_mode=drm_virgl
Merged-In: I27f020b4f661890bcc2817deb09ffb9af1c76f1b
Change-Id: Ic96add709a99005ff7aa6c7d886e3069b827e4bc