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

* commit '155d41a0f29ebe895f32d9c42e47e56acf0be59c':
  Document what algorithms Android Keystore supports.