[automerger skipped] Keep compatibility for old WiFi shortcut am: e739b3c9...

[automerger skipped] Keep compatibility for old WiFi shortcut am: e739b3c9 -s ours am: 1fe930bd -s ours

am skip reason: Merged-In Idb08b9650e7c5efce4ab40eb949ccab0e5949333 with SHA-1 8cf32505 is already in history

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

Change-Id: I6883c3870e76278636227de99e338fb0f9044794