Merge "WiFi: Remove Deprecated methods in BaseWifiService" into sc-dev