Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations" am: 169681db26
am: b663a7d6d7

Change-Id: I64d3251de665cead6b0067728574b367698619d2