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

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