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

Change-Id: I1fd17ac75a6bd69cbe775b8d202f1520750006b6