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

Revert submission 23316821

Reason for revert: breaks touch on some devices b/284203485

Reverted changes: /q/submissionid:23316821
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:342e1dd013c4c5f51a15222d5b112fb14583a636)
Merged-In: Ic4537a645d710a900d6a3b9328bd6489baedbb1d
Change-Id: Ic4537a645d710a900d6a3b9328bd6489baedbb1d