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

# Via Android Git Automerger (2) and others
* commit '2697f082010c9eb34298dbe7b5c4967d745709d2':
  AndroidKeyStore: return error code on error