Revert "Revert "Rename CONNECTED and NOT CONNECTED to IN SERVICE..."

Revert submission 29140667-revert-28767256-349504154-FALOSHWLSG

Reason for revert: Fixed conflict reason and updated

Reverted changes: /q/submissionid:29140667-revert-28767256-349504154-FALOSHWLSG

Change-Id: I5827a390c7a3308ffc6f26f1e6ff358fd111b222
1 file changed