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

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

Change-Id: I550b57cbe0cdf26dd1ed886d53ac905f7c6158b6