[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569
-s ours am: cf07afd1a6
-s ours am: 8cbda65d7c
-s ours am: 850787f791
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18690005 Change-Id: Ifa64fde88447958f6bff33c9140602c65500a213 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: