Revert "Revert "Cleaning up listener when task completes""

This reverts commit 25978ac5b4d38178456c14608f0bc7b8c807d4b9.

Reason for revert: fixing the original bug
Bug: 145829442

Change-Id: Ib0a5ca722f3f66b5501df4a478d82eb3625f113d
1 file changed