Merge "Merge "Switch to WifiManager.{start,stop}SoftAp()" am: 275edcb940 am: 11fdd1769b am: 7d321645a2" into oc-dev-plus-aosp
am: 2ed3ff115b

Change-Id: I1977863e251678fcd8131b90c8f8557af051b5b3