[automerger skipped] Merge "STS refactor @SecurityTest" into qt-qpr1-dev am: 44bda447df -s ours am: b4ecb5b674 -s ours am: e38d5e5438 -s ours

am skip reason: Merged-In I81ceeec63dc2f563b0024740e53733a39f5c6f49 with SHA-1 4b7c926046 is already in history

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

Change-Id: Icf476c53fbce156ec0b0af8f6aeba31707029b45