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

* commit '1da3d7fcf33fd61f0143f8a410f0a77783fe1bfe':
  Add more digests to AndroidKeyStore API.