Merge "Keystore 2.0: Untangle mutex dependencies in add_auth_token."