Merge "[Wi-Fi] Replace WifiTracker with WifiTracker2 for SavedAccessPointsWifiSettings2"