[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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860 Change-Id: If81fe5de7048b8617149f9d5cb4360ec1aad7f81 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: