Merge "Keystore 2.0: Fix wrong check on wrapped key import."