Merge "Update ServiceState to adapt NetworkService change." am: 1168c31c4a am: bc1ea668f9
am: ec00ab16ca  -s ours

Change-Id: I907d4ce3c94209cf421819a12ae8669ad196ef8f