[automerger skipped] Preserve multi-touch slot state when resetting input...

[automerger skipped] Preserve multi-touch slot state when resetting input mappers am: 6c7fd13c am: e8296bdc -s ours

am skip reason: Merged-In Ic59d9fcb4e13fe262c422825c2485185004b719b with SHA-1 afabcde5 is already in history

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



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