Merge "libcore: throw InvalidKeyException instead of ProviderException"