am 2cb1e1dc: am 1da3d7fc: Merge "Add more digests to AndroidKeyStore API."

* commit '2cb1e1dca0ae9d1b34774b16f07974ea56c42cb4':
  Add more digests to AndroidKeyStore API.