am 0838084a: Merge "Align AndroidKeyStore API with user auth API." into mnc-dev

* commit '0838084a3c92d2c64b7eeec6b8a41156977dab59':
  Align AndroidKeyStore API with user auth API.