[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for...

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f5 -s ours am: cf07afd1 -s ours am: 2074939b -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: Ia8b65105dd9e647511f07dd32596fd892f4f33ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>