Merge "update navigation mode settings string" into udc-qpr-dev am: fa0371ae8f am: e66986f9ba

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

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