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

Change-Id: I531d5f5964a1212af5842e682bb95d9ee01a6360