Merge "Fix naming of the service in NetdEventListenerServiceTest"