Merge "Revert "Removing stats service registration in system server""

            traceEnd();

        }

        // Statsd helper

        traceBeginAndSlog("StartStatsCompanionService");

        mSystemServiceManager.startService(StatsCompanionService.Lifecycle.class);

        traceEnd();

        // Before things start rolling, be sure we have decided whether

        // we are in safe mode.

        final boolean safeMode = wm.detectSafeMode();