Merge "STS test update for CVE-2020-0461" into oc-dev am: 06f42d178b am: f12f6c7e46 am: d5c73035c9 am: 5a1c358a20 am: 56e2ecbb4b am: e6b5e877dd

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

Change-Id: Ib96e273a2a2f9b75612d359ec37fc44364bb0373