Uncaught TypeError: Argument 1 RouteSubscriber::__construct() must implement interface EntityManagerInterface after upgrading from 8.x-1.0 to 8.x-3

Problem/Motivation

After updating from 8.x-1.0 to 8.x-3.1, I get this error when I try to clear caches with Drush.

PHP Fatal error: Uncaught TypeError: Argument 1 passed to Drupal\field_group\Routing\RouteSubscriber::__construct() must implement interface Drupal\Core\Entity\EntityManagerInterface, instance of Drupal\Core\Entity\EntityTypeManager given, called in web/core/lib/Drupal/Component/DependencyInjection/Container.php on line 259 and defined in /web/modules/contribfield_group/src/Routing/RouteSubscriber.php:29

The service definition has the following arguments defined: "['@entity_type.manager']", but the constructor expects EntityManagerInterface:

  /**
   * Constructs a RouteSubscriber object.
   *
   * @param \Drupal\Core\Entity\EntityManagerInterface $manager
   *   The entity type manager.
   */
  public function __construct(EntityManagerInterface $manager) {
    $this->manager = $manager;
  }

Proposed resolution

There are 2 options. We can update field_group.services.yml to use "entity.manager" instead of "entity_type.manager", or we can update the class constructor to expect EntityTypeManagerInterface.

Any thoughts on which approach would be preferred?