Merge klp-dev-plus-aosp into stage-aosp-master

Change-Id: Ib7b1888248402804ce55782f52d08bf17fb434de

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

@@ -407,6 +407,10 @@ public class WifiManagerTest extends AndroidTestCase {
      * To pass this CTS test, a connected WiFi link is required.
      */
     public void testWifiWatchdog() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
         // Make sure WiFi is enabled
         if (!mWifiManager.isWifiEnabled()) {
             setWifiEnabled(true);