Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev am:...

Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev am: fc0033fa am: e3281e01 am: 72ded649

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



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