[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 78799a550a
am: d78ed7aa73
-s ours am: 36b5a2c8d3
-s ours am: 9a8b9356d1
-s ours am: 98c2b7b85d
-s ours am: 5912455bf0
-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: Ibdcc7dff5819591e0fc8c41db2861113c926409f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: