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

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

Change-Id: I8a0b297de951860bd5bbf7816c658c2c2f623f2e