Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations" into oc-dev