Merge "Fix inconsistent shortcut strings on accessibility setting and edit...

Merge "Fix inconsistent shortcut strings on accessibility setting and edit dialog" into tm-dev am: 361d42af

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



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