Merge "Fixes NPE in dump of queries"

        for (int user : users) {

            pw.append("    User ").append(Integer.toString(user)).println(":");

            final HashMap<String, Set<String>> queryMapForUser = mImplicitlyQueryable.get(user);

            if (queryMapForUser != null) {

                dumpQueriesMap(pw, filteringPackageName, queryMapForUser, "      ");

            }

        }

    }

    private static void dumpQueriesMap(PrintWriter pw, @Nullable String filteringPackageName,

            HashMap<String, Set<String>> queriesMap, String spacing) {