[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff67 -s ours am: db2ea2bc -s ours am: 14434466 -s ours am: 72fb5c37 -s ours

am skip reason: subject contains skip directive

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



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