Merge "WifiManager: deprecate unused intent extras"