Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9

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

Change-Id: I44f373cab6a829af3e08ab95d62d53a42516d41a