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