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

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

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