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

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