[automerger skipped] Merge Android R am: 847ddc185e -s ours am: 5dcee2010d -s ours am: 61fff86c64 -s ours

am skip reason: Change-Id If2692a1a48cdac011b02966f1355033b211e71ef with SHA-1 0295da1650 is in history

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

Change-Id: I85b8d288b0b4112c9d02ef62bfd6bcc5f90a1d18