Merge "Keystore 2.0: Fix keymint service name."