Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0

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



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