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

Change-Id: I689e6e5cf6a0e9b2c3166c594ec862b01b5bd6f6