[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d
am: 4daf65ea3b
-s ours am: 9d3371ee23
-s ours am: aeab9be2c3
-s ours am: c24add0997
-s ours am: a4609cf869
-s ours am: 2667882654
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860 Change-Id: I4210f34ea4d69d5e3360c657821b9c26aa158908 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: