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

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

Change-Id: I6c1be42a1151feb2d18fcd8d917755b5bee7cfe6