[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a
am: 36069908ce
-s ours am: 02ca401236
-s ours am: 686679749b
-s ours am: 7d66c0ff97
-s ours am: 8d1ed52e6b
-s ours am: fc42296e3c
-s ours am: 029080e5da
-s ours am: 337765a2a8
-s ours am: a6dcacbb88
-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: I202eaafedf5d5a302551d7aa0a035d419a1e8f8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: