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

Change-Id: Ib68e2d099cd98c60429dac7d196f2f023849c6cc