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

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

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

Change-Id: I16ad9a5b8148b1cdb6995692b8da27d511323fa3