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

* commit '97d2d7c42752a52b5fe890cdb9a5dcbbf53837cc':
  Fix minor issues in new Javadocs of AndroidKeyStore.