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

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

Change-Id: I5314de02af569df56332f819ffba68ff4b63e740