Merge "Disallow duplicate listeners for WifiScanner." into mm-wireless-dev