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

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



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