Fix issues with InputMapper tests am: 366904197b

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

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