Merge remote-tracking branch 'cros/main' into 'aosp/master' am: 49756130de am: c90a564896 am: 31afe44a6b am: 8ae691623e

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

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