Merge "WifiScanner: retrieve single scan results" am: 3c70a2fad2
am: c507bcaf63

Change-Id: If67500edf13a396603c7fc4623457d46d7830f89