[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa
am: 381d6120b7
-s ours am: 9270941726
-s ours am: 2711034807
-s ours am: afa26d328a
-s ours am: 9ceb8371a6
-s ours am: 40e8d11254
-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: Id2f4e1ae86ba9bafb8358a3bfaabc56a326b701d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: