Merge "WiFi restricted connection when scan QR code" into tm-dev am: ad5acbdc

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



Change-Id: Ida748419818b6d4e90c89027eca12af6e82cee14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>