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

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



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