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

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

Change-Id: Ie0e4fa82318df652e619541c7e1a81307113944c