Merge "FscryptInstallKeyring: don't re-create keyring if it's already created"