[automerger skipped] Merge Android R am: 56b85f3eb9 -s ours am: d7320879c6 -s ours

am skip reason: Change-Id I5b3fdd030e36f4a3c2407e4d125258368ff61547 with SHA-1 90251e56b2 is in history

Original change: https://android-review.googlesource.com/c/platform/external/deqp-deps/SPIRV-Tools/+/1422307

Change-Id: Iddaa23a86b308312554b97f0e19bf0dc31e65ab7