Merge "STS fix for CVE-2021-0490" into pi-dev am: 8801eb2ed9 am: c756ed7970 am: bc5a21dd11 am: a276a17a12

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

Change-Id: Id01e5a2f6b3a6e2d5bc994a56fe53bba095b110e