events: remove the abort listener on iterator completion

The async iterator returned by the events.on API
now cleans up the abort listener when the iterator ends
regardless of success or failure.

Fixes: #51010

lib/events.js

@@ -1169,7 +1169,7 @@ function on(emitter, event, options = kEmptyObject) {
   }
   if (signal) {
     kResistStopPropagation ??= require('internal/event_target').kResistStopPropagation;
-    eventTargetAgnosticAddListener(
+    addEventListener(
       signal,
       'abort',
       abortListener,

test/parallel/test-events-on-async-iterator.js

@@ -6,6 +6,7 @@ const assert = require('assert');
 const { on, EventEmitter } = require('events');
 const {
   NodeEventTarget,
+  kEvents
 } = require('internal/event_target');
 
 async function basic() {
@@ -372,6 +373,28 @@ async function abortableOnAfterDone() {
   });
 }
 
+async function abortListenerRemovedAfterComplete() {
+  const ee = new EventEmitter();
+  const ac = new AbortController();
+
+  const i = setInterval(() => ee.emit('foo', 'foo'), 1);
+  try {
+    // Return case
+    const endedIterator = on(ee, 'foo', { signal: ac.signal });
+    assert.ok(ac.signal[kEvents].size > 0);
+    endedIterator.return();
+    assert.strictEqual(ac.signal[kEvents].size, 0);
+
+    // Throw case
+    const throwIterator = on(ee, 'foo', { signal: ac.signal });
+    assert.ok(ac.signal[kEvents].size > 0);
+    throwIterator.throw(new Error());
+    assert.strictEqual(ac.signal[kEvents].size, 0);
+  } finally {
+    clearInterval(i);
+  }
+}
+
 async function run() {
   const funcs = [
     basic,
@@ -391,6 +414,7 @@ async function run() {
     eventTargetAbortableOnAfter,
     eventTargetAbortableOnAfter2,
     abortableOnAfterDone,
+    abortListenerRemovedAfterComplete,
   ];
 
   for (const fn of funcs) {