[automerger skipped] Merge "Restrict WiFi network connection" into tm-dev am:...

[automerger skipped] Merge "Restrict WiFi network connection" into tm-dev am: 35484ee8 am: ac5bdb03 -s ours

am skip reason: Merged-In I04aafaa5b383598a0f87eea15d06b38bbc662b9e with SHA-1 190d8715 is already in history

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

Change-Id: I01c7ce56d5b75a096c9f3b8746adb0fe8121b1f5