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

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



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