Merge "Make IME picker UI wording consistent with settings when hardware...

Merge "Make IME picker UI wording consistent with settings when hardware keyboard is connected" into udc-qpr-dev am: 0bc973eb

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



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