Merge "[RESTRICT AUTOMERGE]: STS test fix for CVE-2020-0224" into rvc-dev am: 0edd8fef1e

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

Change-Id: I3ed503b5835d58b87b8a85cc006304dde3920f69