Merge "Switch to WifiManager.{start,stop}SoftAp()" am: 275edcb940
am: 11fdd1769b

Change-Id: If43782074b323a7e2da4315ca342a3706d510959