Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning"...

Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552

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



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