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

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