[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 0295da1650 -s ours

am skip reason: Change-Id Ica08153634c6d2aa43e992880b4609e2616884f8 with SHA-1 a22d92574b is in history

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

Change-Id: I083d8cd0df0dc962ea05fcf84865113d76afcfed