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

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

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



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