Move reset haptic effect into the move event handling.

This is a low risk fix for the regression of the haptic effect not being played by not changing any of the event handling, even though that is
likely worth further investigation. See ag/16624524 for and b/197602842 for more context.

Fix: 197602842
Test: manual
Change-Id: Iacdcb4e9cd3541d6d1ec4f0b1b406ff3f74f46bb