[automerger skipped] Merge "[Panlingual] Settings UI revamp - Navigation...

[automerger skipped] Merge "[Panlingual] Settings UI revamp - Navigation handling" into tm-dev am: 092fe803 am: 765afa56 -s ours

am skip reason: Merged-In Ied357b60c103f25540981cc0cb7abadb020f7995 with SHA-1 9acf3d78 is already in history

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



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