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: 271eb904 am: 9da34166 am: ae60891f

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



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