Merge "Add NETWORK_STACK_SERVICE to SystemServiceRegistry"
am: 55962277bf

Change-Id: I83c6549b1781ce4161609474ee59f848cc7640c6