Merge "Update ServiceState to adapt NetworkService change."
am: 1168c31c4a

Change-Id: Ibbe75b8f9f9498d71fda5e03932439c7832454a6