Merge "Fix cannot add language" into tm-dev am: 65c610c2ab am: 20032a4b13

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

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