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