Merge "STS test update for CVE-2020-0461" into oc-dev am: 06f42d178b am: f12f6c7e46 am: d5c73035c9

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

Change-Id: I26ed4be09a4e2e0c6530617fd773ac0eb5080dba