am 58031d5e: am 378df98e: am 3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine."

* commit '58031d5eb5531f8bc45ac1789ea1cc9134591358':
  Improve the AndroidKeyStore-backed HMAC state machine.