Merge "Don't check broadcast intent on connection status check" am: 4ffaa483a7

Original change: https://android-review.googlesource.com/c/platform/cts/+/1435534

Change-Id: I41a8be18ac7c75239ccf307cedee10348bf967ed

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

@@ -607,7 +607,7 @@ public class ConnectivityManagerTest {
     public void testRequestNetworkCallback_onUnavailable() {
         final boolean previousWifiEnabledState = mWifiManager.isWifiEnabled();
         if (previousWifiEnabledState) {
-            mCtsNetUtils.disconnectFromWifi(null);
+            mCtsNetUtils.ensureWifiDisconnected(null);
         }
 
         final TestNetworkCallback callback = new TestNetworkCallback();