Merge \"Add a WifiScanner API to listener for ongoing scans\" into nyc-mr1-dev
am: 9f750bf5f4

Change-Id: I24bb043b053fed51bd4d0d74214c50c6c351968c