Merge "Skip WifiManager tests if WiFi is not supported am: d4c2d2aca3 am: 632418c11c" into oc-dr1-dev-plus-aosp