[automerger skipped] Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev am: 6a3b697141 am: 2889a7d49f am: 6bdc44eeff -s ours

am skip reason: Merged-In I3892386f8fe2e5c3e29cd7e91f88db65c3693990 with SHA-1 1d37fc6daf is already in history

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

Change-Id: Ia1bd3823bd61af9805e68da6f3f3ef5a41ccd8da