Merge "WifiManager: add call to see if apband conversion is required" into pi-dev am: 85bdd711ce
am: b14e1fdbff

Change-Id: I8899a793ea7e6825d301d151de3713130390b14b