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: e3783a8b am: 2e2bb4d3 am: cd5d6454

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



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