Snap for 5633711 from 6643efb81fa49cde90d206c9f0d899bbf8bddefa to qt-c2f2-release

Change-Id: I3c45eaf4b7c104d62b27ff2f6b222a19d33b3c2c
diff --git a/src/com/android/internal/car/CarServiceHelperService.java b/src/com/android/internal/car/CarServiceHelperService.java
index b942b46..f8842d4 100644
--- a/src/com/android/internal/car/CarServiceHelperService.java
+++ b/src/com/android/internal/car/CarServiceHelperService.java
@@ -276,7 +276,7 @@
             return;
         }
         TimingsTraceLog traceLog = new TimingsTraceLog("SystemServerTiming",
-                Trace.TRACE_TAG_ACTIVITY_MANAGER);
+                Trace.TRACE_TAG_SYSTEM_SERVER);
         traceLog.traceBegin("User0Unlock");
         try {
             // This is for force changing state into RUNNING_LOCKED. Otherwise unlock does not