Merge "Remove unused ScanSettings and WifiChannel classes" into pi-dev
am: c275307166

Change-Id: I20d056cc0f0343c2d2ea7f451f84e4ec6811394b