Merge "Expose NETWORK_STACK permission for system and test API"