Merge remote-tracking branch 'goog/mirror-aosp-master' into 'goog/tm-dev' am: 722a08bb8a am: 0dd22d1f5e

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

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