Merge "Add NETWORK_STACK_SERVICE to SystemServiceRegistry" am: 55962277bf am: c5dfc3ca1b

Change-Id: I230c75de4f9f9f79b3583aace860957c83b0586d