Merge remote-tracking branch 'cros/main' into 'aosp/master' am: 9c34d76be0

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

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