Revert "Always start dismiss transition when the going away anim..."

Revert submission 27770576

Reason for revert: breaks tests listed in b/346405951

Reverted changes: /q/submissionid:27770576

Change-Id: I4b88e4cb43fdef45fe550d68424dc4945571ac3b