Merge "Improve the AndroidKeyStore-backed HMAC state machine."