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: Ib1415979058e2a666e4edf2a46e692379a546d78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>