[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: fb56a11044
-s ours am: f91bdf0c27
-s ours am: c5df73c33d
-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: Iea99a8783c60efaa65719fdbf477f150246b272a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: