Merge "WiFi: Remove deprecated stubs in AbstractWifiService"