Merge "WifiNetworkFactory: Replace ExternalCallbackTracker" into sc-dev