Merge "Fix cannot add language" into tm-dev am: 65c610c2 am: d5d380f9 am: edf16b89

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539527



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