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

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



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