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

* commit '3cc9e5d68d89ea1ffa79ad6981585bc46362c4a7':
  Improve the AndroidKeyStore-backed HMAC state machine.