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

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

Change-Id: I5a4d238512d32c2c9c525481aec804d8243fe6bb