Merge "Add interface name to WifiMetrics" into sc-dev