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

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



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