Merge "Fix dumpsys network_watchlist NPE when watchlist xml is not ready yet"