am 3795f510: am 76e69417: am 8ab76778: Merge "KeyChain: return null instead of throw"

# Via Android Git Automerger (2) and others
* commit '3795f510d313077308a065ae1fe15252d0e6d8b3':
  KeyChain: return null instead of throw