Merge "Revert "Extract network observer code from NetworkManagementService.""
am: 9fdc6d2963

Change-Id: Ib4a7b32a143b3c8f029ccd92191494cd9579e8bd