Remove "listener_id" from functions where it's not in use

Fix functions and callers where "listener_id" wasn't actually used.

Change-Id: I7ca3b4011918d7047ad9a16306653b9054e36c4a
1 file changed