Merge "STS refactor @SecurityTest" into rvc-dev am: ee782ec3fd

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

Change-Id: I0bc88ad0de20f5438446c8e02fa4be6ea467fa47