Mariusz Andrzejewski
--- a/core/modules/user/src/Theme/AdminNegotiator.php
+++ b/core/modules/user/src/Theme/AdminNegotiator.php
   *   The route admin context to determine whether the route is an admin one.
   */
-  public function __construct(AccountInterface $user, ConfigFactoryInterface $config_factory, EntityTypeManagerInterface $entity_type_manager, AdminContext $admin_context) {
+  public function __construct(AccountInterface $user, ConfigFactoryInterface $config_factory, AdminContext $admin_context) {
    $this->user = $user;
    $this->configFactory = $config_factory;
-    $this->entityTypeManager = $entity_type_manager;
    $this->adminContext = $admin_context;
  }

  /**
   * {@inheritdoc}
   */
-  public function applies(RouteMatchInterface $route_match) {
-    return ($this->entityTypeManager->hasHandler('user_role', 'storage') && $this->user->hasPermission('view the administration theme') && $this->adminContext->isAdminRoute($route_match->getRouteObject()));
+  public function applies(RouteMatchInterface $route_match): bool {
--- a/core/modules/user/src/Theme/AdminNegotiator.php
+++ b/core/modules/user/src/Theme/AdminNegotiator.php
   *   The current user.
   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
   *   The config factory.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
   * @param \Drupal\Core\Routing\AdminContext $admin_context
   *   The route admin context to determine whether the route is an admin one.
   */
-  public function __construct(AccountInterface $user, ConfigFactoryInterface $config_factory, EntityTypeManagerInterface $entity_type_manager, AdminContext $admin_context) {
+  public function __construct(AccountInterface $user, ConfigFactoryInterface $config_factory, AdminContext $admin_context) {
--- a/core/profiles/standard/tests/src/FunctionalJavascript/StandardPerformanceTest.php
+++ b/core/profiles/standard/tests/src/FunctionalJavascript/StandardPerformanceTest.php
    $this->assertSame($expected_queries, $recorded_queries);
    $expected = [
      'QueryCount' => 17,
-      'CacheGetCount' => 82,
+      'CacheGetCount' => 81,
--- a/core/modules/system/tests/src/Functional/System/CronRunTest.php
+++ b/core/modules/system/tests/src/Functional/System/CronRunTest.php
   * Make sure the cron UI reads from the state storage.
   */
  public function testCronUI(): void {
-    $admin_user = $this->drupalCreateUser(['administer site configuration']);
+    $admin_user = $this->drupalCreateUser(admin: TRUE);
--- a/core/modules/user/src/Theme/AdminNegotiator.php
+++ b/core/modules/user/src/Theme/AdminNegotiator.php
-   *   The entity type manager.
-   * @param \Drupal\Core\Routing\AdminContext $admin_context
+   * @param \Drupal\Core\Routing\AdminContext|EntityTypeManagerInterface $admin_context
   *   The route admin context to determine whether the route is an admin one.
   */
-  public function __construct(AccountInterface $user, ConfigFactoryInterface $config_factory, EntityTypeManagerInterface $entity_type_manager, AdminContext $admin_context) {
+  public function __construct(AccountInterface $user, ConfigFactoryInterface $config_factory, AdminContext|EntityTypeManagerInterface $admin_context) {
    $this->user = $user;
    $this->configFactory = $config_factory;
-    $this->entityTypeManager = $entity_type_manager;
-    $this->adminContext = $admin_context;
+
+    if ($admin_context instanceof EntityTypeManagerInterface) {
+      $deprecated_service_name = EntityTypeManagerInterface::class;
+      @trigger_error("Passing the $deprecated_service_name (entity_type.manager service) to AdminNegotiator is deprecated in drupal:11.2.0 and will be removed in drupal:12.0.0. There is no replacement for this service, as it is not used. See https://www.drupal.org/project/drupal/issues/3501727", E_USER_DEPRECATED);
+      $this->adminContext = func_get_arg(3);
--- a/core/profiles/standard/tests/src/FunctionalJavascript/StandardPerformanceTest.php
+++ b/core/profiles/standard/tests/src/FunctionalJavascript/StandardPerformanceTest.php
    $this->assertSame($expected_queries, $recorded_queries);
    $expected = [
      'QueryCount' => 17,
-      'CacheGetCount' => 82,
+      'CacheGetCount' => 81,