[automerger skipped] [Panlingual] Settings UI revamp - Navigation handling am: 9acf3d78 -s ours

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

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



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