am 29542143: Merge "Document the security features of Android Keystore." into mnc-dev

* commit '29542143b1b09ce690dc64b3569bf4ba6bfd8ed6':
  Document the security features of Android Keystore.