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: 62d3c470 am: e4f47318" into tm-qpr-dev-plus-aosp am: c5d0fb44

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



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