Merge "Move reset haptic effect into the move event handling." into tm-qpr-dev am: 84e751f9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20208975



Change-Id: Ibbccf89f77b3c942830829846dd43d7c2089d7af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>