Merge "STS test for Android Security b/261036568" into rvc-dev am: 4c4750ef17 am: 5fa170bed2 am: 229551bf6a

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

Change-Id: I6181839b3f478e4eab0e745aafdb23bf4af46c8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>