Merge "WifiScanner: Add scan request type to ScanSettings"