[automerger skipped] Merge "STS refactor @SecurityTest" into qt-dev am: dc4cc66ed4 -s ours am: 81ee498931 -s ours am: d0e9e81020 -s ours am: 5dea697b88 -s ours

am skip reason: Merged-In I81ceeec63dc2f563b0024740e53733a39f5c6f49 with SHA-1 1935490dce is already in history

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

Change-Id: Ida63632764426cc8b52a5835ee6c5901ae51b805