Merge "Keystore2 Tests: Revisit run_as function." am: 373561fd1e am: 6bf3847189

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1912972

Change-Id: I1adde1547f03dd0b4959e6e7e3172384d49b7998