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

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

Change-Id: I1d3a0b4107b7d6acb60efe61016179a61b87b6ec