Merge "Revert "Extract network observer code from NetworkManagementService.""