Merge "Remove WifiManager 'scanWithTraffic' APIs"