Merge "Keystore 2.0: Remove unused mock KeyStore."