Merge "WifiManager: Remove unused methods"