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

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552 am: 95d21bc1 -s ours am: 18c00007 -s ours am: 148b2d99 -s ours am: fd627f9c -s ours am: 729c5d04 -s ours am: d299b72b -s ours

am skip reason: subject contains skip directive

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



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