network: refactor code for state handler

Make watch(), remove() as a member of stateNotifier.

Change-Id: Ia9f5d868f66107155a05dc60642832ad282ae00d