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

# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '8ab767786a3b59c72b613f84d40b181428327ac1':
  KeyChain: return null instead of throw

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base