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

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

Change-Id: Ibf5cc99c1e4ac1798a804b35a975e72c21bf2c91