[automerger skipped] Merge "STS test for Android Security CVE-2021-0921" into pi-dev am: a82d6072bc -s ours am: 31ce0c22ab -s ours am: b252b4b210 -s ours am: c61045f005 -s ours am: 281dae883c -s ours am: 3ccf2b22cc -s ours

am skip reason: Merged-In Ie5505d4d8d42bc5269d7ef6de9d185ef19f9bcd3 with SHA-1 3eb230d05e is already in history

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

Change-Id: Ic974f1fad92d7b3d461eb6ed3535c6dc5b9cbad7