[automerger skipped] Merge Android 12 am: b8924450d9 -s ours am: 53998af338 -s ours am: 7b17b3003f -s ours am: b9465dc97b -s ours

am skip reason: Merged-In I26ea52b77ac7824649b4a6bd3ddd253d0ef80f73 with SHA-1 9edace21f5 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/deqp-deps/glslang/+/1847159

Change-Id: I9886b88bb458052a80c84531f78d058a1772c908