Merge "Rename WifiSsid.NONE to WifiManager.UNKNOWN_SSID"