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 am: eaf0aa37

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



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