[automerger skipped] Merge "STS test for Android Security CVE-2021-290368" into qt-dev am: 2195221572 am: 1a83d90a62 am: f0f3623390 am: ba09eab7f3 -s ours am: 1d4a9a96d1 -s ours

am skip reason: Merged-In I8ca3dfb07e01fa4d3b20206a968829805a72d233 with SHA-1 167888ff14 is already in history

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

Change-Id: I077abff3aaffc65def76fc79874372fe5f90986f