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

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

Change-Id: If3b4e793e435b504a3cbbfa1b31595d2412fe700