[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa
am: 1e45df2451
-s ours am: 4b9394808a
-s ours am: 0af985d835
-s ours am: d015f6258b
-s ours am: 54c6d7ed8a
-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: Ic8b7e21d9a176f89d6b9d929b85def165ee80cb2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: