Merge changes from topic "inputmapper-refactor-udc-dev" into udc-dev am: 50fe0d96 am: e3783a8b

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



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