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

Change-Id: Ic4537a645d710a900d6a3b9328bd6489baedbb1d
3 files changed