Merge \"Add a WifiScanner API to listen for ongoing scans\" into nyc-mr1-dev
am: 450fee26a2

Change-Id: I361d4634c2380ce9b4fd78a02dce08158386b03b
tree: 7e849b6d8f04ad0dc1c2c5e2297dc51ed47815e7
  1. service/
  2. tests/