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

Change-Id: Ibc628e3f2f5dd440ae4ce87086ff2783e17c43d4