[automerger skipped] Merge 24Q3 to AOSP main am: 0648b7b4 -s ours am: b8e65aeb -s ours

am skip reason: Merged-In Ibf6c0e2564657a94eaebb03e3ac3e13192376546 with SHA-1 aed4566b is already in history

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



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