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

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



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