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

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



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