am 887c5236: am 74637db2: Merge "AndroidKeyStore: return error code on error"

# Via Android Git Automerger (1) and others
* commit '887c523646012f4f0b63f5ffd0a1e9ebc3c2bdf1':
  AndroidKeyStore: return error code on error