[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: f4631f9055
-s ours am: 4ca497d380
-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: Ie681e37405a1528fe746dd27f4f6b2b0329defd4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: