[automerger skipped] Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev am: 6a3b697141
am: 7e7b237092
-s ours
am skip reason: Merged-In I3892386f8fe2e5c3e29cd7e91f88db65c3693990 with SHA-1 b1b2da9aca
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15671537
Change-Id: I6e69becb33f5c3bef0569b676eb366b90272445e
This commit is contained in: