Merge "Fix keyboard not configured properly" into udc-dev am: 26043b29

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



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