[automerger skipped] Merge "STS test for Android Security CVE-2021-0306" into oc-mr1-dev am: 6372265db6 -s ours am: 04972cef68 -s ours am: 19951c5dfc -s ours am: 2c63f17c46 -s ours

am skip reason: Change-Id I9b6a1a7434b6196375894462aeed5c770fb10af6 with SHA-1 13822e1d0a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87e1269f733dbbc11daaa1712cbb14f4f9dcf4e0