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: 3a4d63e7

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



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