Merge "WifiMetrics: Replace ExternalCallbackTracker"