[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552c6 am: 95d21bc12f -s ours am: 18c00007b7 -s ours am: 8e637809fd -s ours am: 312065af42 -s ours am: 91a7965763 -s ours am: c60612b5ac -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: Idc48308018bb75ff7e11908cb53aa2934956e94c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: