Merge "Add internal WifiTracker to get correct AccessPoint for WifiNetworkRequestDialog"