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

* commit 'aec5a14e6cc0464b157a5b098d056ed17c39a579':
  Document what algorithms Android Keystore supports.