Merge "Add a WifiScanner API to listener for ongoing scans" into nyc-mr1-dev