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

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

Change-Id: I57c66162b53fb5a35965c3061200e8d50b548c63