Merge "Merge SQ3A.220605.009" am: ce1e34c2d1

Original change: https://android-review.googlesource.com/c/platform/external/mesa3d/+/2130153

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