Merge "Move AdvancedWifiSettings into ConfigureWifiSettings."