Merge "Remove unused WifiConfigManager symbols and values" into nyc-dev