Merge "Prevent potential NPE when forcing stop package during boot"

        public boolean onForceStopPackage(String packageName, boolean doit, boolean evenPersistent,

                int userId) {

            synchronized (mGlobalLock) {

                // In case if setWindowManager hasn't been called yet when booting.

                if (mRootWindowContainer == null) return false;

                return mRootWindowContainer.finishDisabledPackageActivities(packageName,

                        null /* filterByClasses */, doit, evenPersistent, userId,

                        // Only remove the activities without process because the activities with