Revert "Avoid duplication of AppWindowToken in created Task"

Hunting for the cause of a fairly recent ANR

This reverts commit ee1acd0e71e19106ea04ee068c303e90eb7ae9c5.

Change-Id: I98133c59e3989c89f090a8e94b253db2007a874b