[automerger skipped] Merge "Restrict Wi-Fi configuration if settings UI is...

[automerger skipped] Merge "Restrict Wi-Fi configuration if settings UI is restricted" into tm-qpr-dev am: ee21072a am: e7e1f373 -s ours

am skip reason: Merged-In Id82498f41765f955e01bb311bb221d26f9574f31 with SHA-1 aaa65fc6 is already in history

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



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