[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: 381d6120 -s ours am: 92709417 -s ours am: 27110348 -s ours am: f4631f90 -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: I0d4d1335fa6b1e330bb5bb97298b999d145dc1bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>