Merge "STS test fix for CVE-2021-0686" into qt-dev am: e4047f5529 am: 4492dbed00 am: c7ad79cc3d am: c1daaab673 am: 7b6d6b34a7

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

Change-Id: I57c979422806061de58e2a78faf7747bdcd694ce