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

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



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