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

Merge "Fix app language show "Und" when all languages in the suggestion list" into tm-dev am: 8848ca6f am: 62d3c470 am: e4f47318

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



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