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

Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312

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



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