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

# Via Android Git Automerger (1) and others
* commit '76e694172a16e346ff2ce783c3768176bd351319':
  KeyChain: return null instead of throw