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

Change-Id: I89da2a27cf0edabd0edd3dfbef697c27fa00c7a1