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

Change-Id: If6c7225e853e1969022d9b9d6cee127c477e0df7