Snap for 8508895 from 04911f9ef2439304e1a857e4a421c8545762074c to tm-release am: cce6353974

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

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