Revert "InputMapper refactor: Revert "fix touch issue on portrai..." am: 51399574 am: f2378b79

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



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