[automerger skipped] Merge "InputMapper refactor: KeyboardInputMapper" into...

[automerger skipped] Merge "InputMapper refactor: KeyboardInputMapper" into udc-dev am: b94c0268 am: 0c154465 am: 25ba420a -s ours am: e9310823 -s ours

am skip reason: Merged-In Iceb8676542de85309c208af93ee7cc385e46a067 with SHA-1 033e3ec9 is already in history

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



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