am 8676a88e: am 97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore."

* commit '8676a88e60ed342cfb5c576aef80960976e3c396':
  Fix minor issues in new Javadocs of AndroidKeyStore.