Merge "Add memtrackproxy system server service" into sc-dev am: 8ad4734407

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14093445

Change-Id: Ibd72c6de7bdfa407b969ea65957ae936b1cf6dd0

services/java/com/android/server/SystemServer.java

@@ -453,6 +453,11 @@ public final class SystemServer implements Dumpable {
      */
     private static native void startSensorService();
 
+    /**
+     * Start the memtrack proxy service.
+     */
+    private static native void startMemtrackProxyService();
+
     /**
      * Start all HIDL services that are run inside the system server. This may take some time.
      */
@@ -1044,6 +1049,12 @@ public final class SystemServer implements Dumpable {
         mSystemServiceManager.startService(PowerStatsService.class);
         t.traceEnd();
 
+        // Start MemtrackProxyService before ActivityManager, so that early calls
+        // to Memtrack::getMemory() don't fail.
+        t.traceBegin("MemtrackProxyService");
+        startMemtrackProxyService();
+        t.traceEnd();
+
         // Activity manager runs the show.
         t.traceBegin("StartActivityManager");
         // TODO: Might need to move after migration to WM.