Merge "Add DISALLOW_CHANGE_WIFI_STATE user restriction" into tm-dev am: 2bc6dae0 am: 2bf7de91

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17630443



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