am b068ae14: am e2b9bb45: Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."

* commit 'b068ae143df2c2f3030da23d7fc130f735975867':
  No runtime exceptions during normal use of AndroidKeyStore crypto.