Merge "Fix : recent Connectivity module with old NetworkStack module"

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

@@ -925,6 +925,7 @@ public class ConnectivityServiceTest {
                 return null;
             };
 
+            doAnswer(validateAnswer).when(mNetworkMonitor).notifyNetworkConnected(any(), any());
             doAnswer(validateAnswer).when(mNetworkMonitor).notifyNetworkConnectedParcel(any());
             doAnswer(validateAnswer).when(mNetworkMonitor).forceReevaluation(anyInt());