[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 78799a550a
am: d78ed7aa73
-s ours am: 36b5a2c8d3
-s ours am: afc61aa166
-s ours am: 86756bbbcc
-s ours am: 7379f86f26
-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: Id6481c9c708c3214ef27d8146ad19fc4b1f5f701 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: