Merge "WifiScanner: retrieve single scan results" am: 3c70a2fad2 am: c507bcaf63 am: 6d2cca0f43
am: 683bc64b6b

Change-Id: I39e4061c2afac1f841bb800b40d15f32d529f214