Merge "Add tests for NetworkMonitor isCaptivePortal"

tests/net/java/com/android/server/ConnectivityServiceTest.java

@@ -880,7 +880,7 @@ public class ConnectivityServiceTest {
                 NetworkAgentInfo networkAgentInfo, NetworkRequest defaultRequest,
                 IpConnectivityLog log) {
             super(context, handler, networkAgentInfo, defaultRequest, log,
-                    NetworkMonitor.NetworkMonitorSettings.DEFAULT);
+                    NetworkMonitor.Dependencies.DEFAULT);
             connectivityHandler = handler;
         }