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

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

Change-Id: I3c37d012155812c6d30e8d1f37c6fab6bbfe877b