Merge "Add RecoverableKeyStoreLoader implementation in LockSettingsService."