Merge "Fix lost singleton provider after force-stopping user or package." into mnc-dev

    boolean collectPackageProvidersLocked(String packageName, Set<String> filterByClasses,

            boolean doit, boolean evenPersistent, int userId,

            ArrayList<ContentProviderRecord> result) {

        boolean didSomething = collectPackageProvidersLocked(packageName, filterByClasses,

        boolean didSomething = false;

        if (userId == UserHandle.USER_ALL || userId == UserHandle.USER_OWNER) {

            didSomething = collectPackageProvidersLocked(packageName, filterByClasses,

                    doit, evenPersistent, mSingletonByClass, result);

        }

        if (!doit && didSomething) {

            return true;

        }