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

Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev am: 16b3ddf4 am: f610a7c0 am: 51b6d110

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



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