Merge "STS test fix for Android Security CVE-2021-0339" into oc-mr1-dev am: dae627e571 am: ce9ecec68a am: fc801d8c7c

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

Change-Id: I9375f6d4555b5dd0847034a05844b4aef2310c59