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

Merge changes from topic "inputmapper-refactor-udc-dev" into udc-dev am: 50fe0d96 am: 4e5cfeb3 am: 22b22c5a

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



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