Merge "Fix cleaning up all persistent preferred activity" into main

    }

    boolean clearPersistentPreferredActivity(IntentFilter filter, int userId) {

        ArrayList<PersistentPreferredActivity> removed = null;

        PersistentPreferredIntentResolver ppir = mPersistentPreferredActivities.get(userId);

        Iterator<PersistentPreferredActivity> it = ppir.filterIterator();

        boolean changed = false;

        while (it.hasNext()) {

            PersistentPreferredActivity ppa = it.next();

            if (IntentFilter.filterEquals(ppa.getIntentFilter(), filter)) {

                if (removed == null) {

                    removed = new ArrayList<>();

                }

                removed.add(ppa);

            }

        }

        if (removed != null) {

            for (int i = 0; i < removed.size(); i++) {

                PersistentPreferredActivity ppa = removed.get(i);

                ppir.removeFilter(ppa);

                changed = true;

                break;

            }

            changed = true;

        }

        if (changed) {

            onChanged();