[automerger skipped] Merge "STS test for Android Security CVE-2021-0485" into mainline-prod am: 6ea1f14b76 -s ours

am skip reason: skip tag Change-Id I58b4ac0d778dfbca504e85fd3a2cf2bb542d68e0 with SHA-1 3135410716 is already in history

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

Change-Id: Ia24277dd3d4b9bcee503f38ea4f3a672c2ce0327