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 am: 19846d0c am: 800664ab

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



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