Merge "InputMapper refactor: CursorInputMapper" into udc-dev am: f706615310 am: 4015edbc95

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

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