[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: 93ea8b01c8 -s ours am: 096a94798e -s ours

am skip reason: Merged-In I32b495e31f3222436ab0662770d859cf9140bc86 with SHA-1 f73882396b is already in history

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

Change-Id: I4263165bd2f2aa421c4571a8624be2f113852a09