Merge remote-tracking branch 'cros/main' into 'aosp/master' am: ea61838d9b am: 903c00c4bf am: 6104d65004 am: 64d3874976

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

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