[automerger skipped] Merge "STS test for Android Security CVE-2020-0099" into oc-dev am: ba529d11e9 -s ours am: 3eeab181b5 -s ours

am skip reason: Change-Id I2ee0ad4532d7847aea8e9b3f002fe97a05e8eb68 with SHA-1 d3499d4039 is in history

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

Change-Id: I398902ac0c5515033d276e7d174166f1c2aef94a