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

* commit 'a65101cd49247f792ae05bc31458c73bbcacf6c0':
  Align AndroidKeyStore API with user auth API.