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

    private final RecoverableKeyGenerator mRecoverableKeyGenerator;

    private final RecoverySnapshotStorage mSnapshotStorage;

    private final PlatformKeyManager mPlatformKeyManager;

    private final KeyStore mKeyStore;

    private final ApplicationKeyStorage mApplicationKeyStorage;

    /**

            mInstance = new RecoverableKeyStoreManager(

                    context.getApplicationContext(),

                    keystore,

                    db,

                    new RecoverySessionStorage(),

                    Executors.newSingleThreadExecutor(),

    @VisibleForTesting

    RecoverableKeyStoreManager(

            Context context,

            KeyStore keystore,

            RecoverableKeyStoreDb recoverableKeyStoreDb,

            RecoverySessionStorage recoverySessionStorage,

            ExecutorService executorService,

            PlatformKeyManager platformKeyManager,

            ApplicationKeyStorage applicationKeyStorage) {

        mContext = context;

        mKeyStore = keystore;

        mDatabase = recoverableKeyStoreDb;

        mRecoverySessionStorage = recoverySessionStorage;

        mExecutorService = executorService;

        mRecoverableKeyStoreManager = new RecoverableKeyStoreManager(

                mMockContext,

                KeyStore.getInstance(),

                mRecoverableKeyStoreDb,

                mRecoverySessionStorage,

                Executors.newSingleThreadExecutor(),