Merge "WiFi: Migrate WifiServiceImpl to use AbstractWifiService"