Merge "WifiManagerTest: Don't assert for isScanAlwaysAvailable" into pi-dev

am: 9ead90f773

Change-Id: If7b07dff9747a43025c480c4f2304f73aa39688d

tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java

@@ -295,11 +295,10 @@ public class WifiManagerTest extends AndroidTestCase {
             fail("Please enable location for this test - since Marshmallow WiFi scan results are"
                     + " empty when location is disabled!");
         }
-        assertTrue(mWifiManager.isScanAlwaysAvailable());
         setWifiEnabled(false);
         Thread.sleep(DURATION);
         startScan();
-        if (isScanCurrentlyAvailable()) {
+        if (mWifiManager.isScanAlwaysAvailable() && isScanCurrentlyAvailable()) {
             // Make sure at least one AP is found.
             assertNotNull("mScanResult should not be null!", mScanResults);
             assertFalse("empty scan results!", mScanResults.isEmpty());