am d2eec1a7: Merge "Add exception types for AndroidKeyStore key validity issues."

* commit 'd2eec1a7865dd552114b330fce1a1472a9e08806':
  Add exception types for AndroidKeyStore key validity issues.