Merge "Switch to WifiManager.{start,stop}SoftAp()"