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

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

Change-Id: I63b2542d02d71c7f7e82002d16b2dd919311df3c