Merge "Restrict WifiScanModeActivity for guest user" into tm-qpr-dev am: b4ad581f am: 17070ee0

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



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