[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552c6
am: 95d21bc12f
-s ours am: 18c00007b7
-s ours am: 148b2d99ba
-s ours am: fd627f9c1d
-s ours am: 729c5d0487
-s ours am: f59cba01c2
-s ours am: e4afecdfbb
-s ours am: b7c00690b9
-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: I0efad95111ce99f0bf87adfc913ba55fa5a2de08 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: