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

Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af04

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



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