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

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



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