Merge "STS test fix for CVE-2021-0305" into qt-dev am: 770262d0ad am: d24a4ef50e am: a591d6b8f9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85790c556ef312a2794e7c180b2d97fdd4c63b0b