Merge "Use WifiPickerTracker to get connected WifiEntry"