Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 05e18e7232 am: 0286bdce3d

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

Change-Id: Ideb8620c13b26ca9bbc4bed90f020cb558a77e34