Keystore 2.0: Address slight behavior changes. Since we are redirecting public key operations to the default provider there are tiny behavior changes. Test: N/A Change-Id: I3b1b4bcb0650109a25a374d5fb9f49195194737c