Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa am: 2fc065c3

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



Change-Id: I78091edeaf8056f515f2e8bf882f272282985793
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>