[automerger skipped] STS test for Android Security CVE-2020-29661 am: 66e99c100c -s ours am: 25743a157a -s ours am: be0122c681 -s ours am: fff065720a -s ours am: b78dc3d0ff -s ours am: 3a25c0108f -s ours am: 3cf593399d -s ours

am skip reason: Merged-In I6b30b85f4c17064dda8347c17105088ff4ca44a7 with SHA-1 6c8738f987 is already in history

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

Change-Id: I43cc246ff3e3d49b43423a03f58ce102db2ea757