Merge "Pause watchdog triggering on the main thread during package scan"

            MetricsLogger.histogram(null, "boot_package_manager_init_start",

                    (int) SystemClock.elapsedRealtime());

        }

        t.traceBegin("StartPackageManagerService");

        try {

            Watchdog.getInstance().pauseWatchingCurrentThread("packagemanagermain");

            mPackageManagerService = PackageManagerService.main(mSystemContext, installer,

                    mFactoryTestMode != FactoryTest.FACTORY_TEST_OFF, mOnlyCore);

        } finally {

            Watchdog.getInstance().resumeWatchingCurrentThread("packagemanagermain");

        }

        mFirstBoot = mPackageManagerService.isFirstBoot();

        mPackageManager = mSystemContext.getPackageManager();

        t.traceEnd();