Merge "Remove unused KeyStore field in RecoverableKeyStoreManager" into pi-dev am: 87860048bd
am: f99fcd3157

Change-Id: I68de5aa7db935ecec247a6a3c0dce0c1c8657b82