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

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312 am: 1e45df24 -s ours am: 4b939480 -s ours am: fb56a110 -s ours am: f91bdf0c -s ours

am skip reason: subject contains skip directive

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



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