Merge "Add NETWORK_STACK_SERVICE to SystemServiceRegistry"