Merge "NetworkWatchlistServiceTests: update IIpConnectivityMetrics."