Merge "wifi: add interface name to ScanResult"