Merge "Merge "Fix app language show "Und" when all languages in the suggestion...

Merge "Merge "Fix app language show "Und" when all languages in the suggestion list" into tm-dev am: 8848ca6f am: 40e5e913" into tm-d1-dev-plus-aosp am: 2581275f

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



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