[automerger skipped] Update STS tests to NonRootSecurityTestCase am: 76219d11ac am: c4ebb98970 -s ours am: 043a78b0d5 -s ours am: 53b10012c2 -s ours am: 3732c415e2 -s ours am: 54be731de2 -s ours am: f32bdc1f10 -s ours

am skip reason: Merged-In Ic95ed5a05758219db38fb4998ac445a88d3391b7 with SHA-1 b508745fa7 is already in history

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

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