[automerger skipped] Merge "STS test for Android Security CVE-2020-29661" into qt-dev am: 043a16448a am: de4984b528 am: 27a113281c am: 90938843a6 -s ours am: 1fcf024d4e -s ours

am skip reason: Merged-In I6b30b85f4c17064dda8347c17105088ff4ca44a7 with SHA-1 355a91b61a is already in history

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

Change-Id: I0f02a97a49acb7ab7b9cb7bb312a554890e7edde