Merge "Keystore 2.0: Move test utils to separate library."