[automerger skipped] Merge "STS test for Android Security CVE-2021-0306" into pi-dev am: cbc8af83cd -s ours am: ae1bcd0f09 -s ours am: 449ba55713 -s ours am: fd22aadf42 -s ours

am skip reason: Change-Id I9b6a1a7434b6196375894462aeed5c770fb10af6 with SHA-1 2d3ace2163 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0d1ea3c21a93ab7287a732ad16de4def36516a3