Merge "WifiScanner: Remove pnosetting stopPno API (1/2)" into nyc-dev