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

Change-Id: I4f2c8e9ebcfd4bb92cad23f222218960188ca09b