[automerger skipped] Merge "[RESTRICT AUTOMERGE]: STS test fix for CVE-2020-0224" into rvc-qpr-dev-plus-aosp am: 9033d64a3c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I36566f1dcb9f31e4dd33775de481941c05456b0e