Merge "WifiManager: mark WPS related API calls deprecated"