[automerger skipped] Merge Android U (ab/10368041) am: 23a9bcfa76 -s ours am: 547d14cb12 -s ours am: d0b2f95aee -s ours am: ce39bf7c04 -s ours

am skip reason: Merged-In I6ae9e6aff054e05c8475eaf66f6054db2eb49b47 with SHA-1 63f702d9f6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/deqp-deps/SPIRV-Headers/+/24182571

Change-Id: I68a61537cb7bc28e10aa1ca00049c4ccc45cc0ce
Signed-off-by: Automerger Merge Worker <[email protected]>