Merge "Keystore 2.0: Fix getKey returns null on key not found."