Merge "Allow NetworkStack permissions in netd"