Merge "Reset touch state when device resets" into udc-dev am: b49fc5d5 am:...

Merge "Reset touch state when device resets" into udc-dev am: b49fc5d5 am: 600c37ae am: 688266ad

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



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