Merge "Keystore 2.0: Add error string to service specific exceptions."