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

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



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