Merge "Keystore2 Tests: Revisit run_as function."