Merge "Copy WifiSettings base code into WifiSettings2 without WifiTracker"