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