Fix bad merge resolution in LockSettingsService.java

The merge commit 8a5dadb79051 (http://ag/25090532) duplicated the line
'mLockSettingsService.deleteRepairModePersistentDataIfNeeded();'.
Fix this to make AOSP main match internal main.

Test: atest com.android.server.locksettings
Change-Id: I8e4326c33b715bc6a1fef7dbf6ce53cd69c1b93a

1 files changed, 0 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index c3049dbcd980..c08b6d2301e8 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsService.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -352,7 +352,6 @@ public class LockSettingsService extends ILockSettings.Stub {
                 mLockSettingsService.deleteRepairModePersistentDataIfNeeded();
             } else if (phase == PHASE_BOOT_COMPLETED) {
                 mLockSettingsService.loadEscrowData();
-                mLockSettingsService.deleteRepairModePersistentDataIfNeeded();
             }
         }