Merge changes from topic "InputMapper-refactor-256009910" into udc-dev am:...

Merge changes from topic "InputMapper-refactor-256009910" into udc-dev am: 29b38f3b am: bb7e20df

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



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