Merge "WifiConnectivityManager: Refactor instantiation in ClientModeImpl"