Merge remote-tracking branch 'goog/mirror-aosp-master' into 'goog/sc-dev' am: 43750d7950

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

Change-Id: I0ef1480b9fc380bce9fa06a0c92a1e9467474733