Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: Idbb54a5542a7c734c12403928e812141e2c56eb0
Change-Id: I05f97636e516381ec26743851226b5919215514c
diff --git a/src/com/android/internal/car/CarServiceHelperService.java b/src/com/android/internal/car/CarServiceHelperService.java
index 3710f82..5772e19 100644
--- a/src/com/android/internal/car/CarServiceHelperService.java
+++ b/src/com/android/internal/car/CarServiceHelperService.java
@@ -323,8 +323,6 @@
                     return;
                 }
             }
-            // System user started and unlocked
-            handleUserLockStatusChange(UserHandle.USER_SYSTEM, true);
         } catch (RemoteException e) {
             // should not happen for local call.
             Slog.wtf("RemoteException from AMS", e);