[automerger skipped] Merge "STS test for Android Security CVE-2021-0306" into oc-dev am: 91671074b2 -s ours am: fb89756797 -s ours am: 2dd1ecf242 -s ours am: db181b7e62 -s ours am: c090ce0541 -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/+/13205134

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51241fc70cf3a5c7bf60f71e610bc1b1a9b98ef0