am 22726cf8: Return error codes for storing the key/cert in addPkcs12Keystore()

Merge commit '22726cf8174fe00a097c89b8da397b10626cdd00'

* commit '22726cf8174fe00a097c89b8da397b10626cdd00':
  Return error codes for storing the key/cert in addPkcs12Keystore()