Merge "System Router: Don't filter by individual prefs" into tm-dev

    private List<MediaRoute2Info> filterRoutesWithIndividualPreference(

            List<MediaRoute2Info> routes, RouteDiscoveryPreference discoveryPreference) {

        List<MediaRoute2Info> filteredRoutes = new ArrayList<>();

        if (isSystemRouter()) {

            // Individual discovery preferences do not apply for the system router.

            filteredRoutes.addAll(routes);

            return filteredRoutes;

        }

        for (MediaRoute2Info route : routes) {

            if (!route.hasAnyFeatures(discoveryPreference.getPreferredFeatures())) {

                continue;