[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: 05c849c030
-s ours am: 15e4092ab1
-s ours am: e3448236fb
-s ours am: d2b4eb16df
-s ours am: b3f42ca856
-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: Ide37275d8988b6c77a77d6bac0b0afceb41af04c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: