am 6d8cf7a7: am bb320299: am 155d41a0: am 304b01c2: Merge "Document what algorithms Android Keystore supports." into mnc-dev

* commit '6d8cf7a7a063cfa0c37ea85946c6f1fe105435c5':
  Document what algorithms Android Keystore supports.