Merge "Correct Magnification shortcut title in edit shortcut dialog" into...

Merge "Correct Magnification shortcut title in edit shortcut dialog" into tm-dev am: 76ae7845 am: 18bd8436

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



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