Merge "Move the NetworkStack tests to unit/ to add an integration test." into qt-dev

am: 35dd095a4f

Change-Id: If5881cf6cef339f76b1ab914bb45f6f4b87e1577

packages/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java

@@ -297,6 +297,7 @@ public class NetworkMonitorTest {
         setOtherFallbackUrls(TEST_OTHER_FALLBACK_URL);
         setFallbackSpecs(null); // Test with no fallback spec by default
         when(mRandom.nextInt()).thenReturn(0);
+
         // DNS probe timeout should not be defined more than half of HANDLER_TIMEOUT_MS. Otherwise,
         // it will fail the test because of timeout expired for querying AAAA and A sequentially.
         when(mResources.getInteger(eq(R.integer.config_captive_portal_dns_probe_timeout)))