[automerger skipped] Merge "[RESTRICT AUTOMERGE]: STS test fix for CVE-2018-11261" into oc-mr1-dev am: 554adca0f4 -s ours am: 6544758504 -s ours am: 6cf2272c1f am: c1133cc7be -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/14006418

Change-Id: I9c45dc6327b7399a1079a4b154f1f9e9a3b49b9c