Revert "Cleaning up listener when task completes"

This reverts commit 4c980fe0e08adcee7213dc2af3972d9a19a9051f.

Reason for revert: b/146116098

Change-Id: Ifafe0542e91661e52662d711a848996cbb3f57c8
1 file changed