Merge "Add initial WifiTracker2 into WifiSettings2"