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

* commit '378df98eab65547f62cb900e9dca0b7419095755':
  Improve the AndroidKeyStore-backed HMAC state machine.