Revert^2 "Fix a crash when registering/unregistering a smartspace timer listener."

This reverts commit 9ae796c523466f44d4204ba7ee70cc6b610b7a7c.

Reason for revert: Does not appear to be the root cause of b/323782475.

Change-Id: I3f167adae28f02781ae31d41f78e9b494c4bc501
1 file changed