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

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

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