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: 246f5e23

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



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