[HttpKernel] fix merge

Author: nicolas-grekas

Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php

@@ -467,7 +467,7 @@ public function testAutowireAttribute()
         $container = new ContainerBuilder();
         $resolver = $container->register('argument_resolver.service', 'stdClass')->addArgument([]);
 
-        $container->register('some.id', \stdClass::class);
+        $container->register('some.id', \stdClass::class)->setPublic(true);
         $container->setParameter('some.parameter', 'foo');
 
         $container->register('foo', WithAutowireAttribute::class)