Merge branch android10-qpr3-release

Change-Id: I39b572d934142826b4a6d162eb0af722f93ad2d7
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);