[automerger skipped] Merge Android R am: 847ddc185e -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: Ife129dbee5c85e6d31b53751d9964d7737c89fd1