Merge "Merge "InputMapper refactor: TouchpadInputMapper" into udc-dev am:...

Merge "Merge "InputMapper refactor: TouchpadInputMapper" into udc-dev am: e015d026 am: 3ba2b9c5 am: 2c512bf0" into udc-qpr-dev-plus-aosp am: b165108e

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



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