[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af04 am: 36069908 -s ours am: 02ca4012 -s ours am: 68667974 -s ours am: 7d66c0ff -s ours am: 05c849c0 -s ours am: 15e4092a -s ours am: e3448236 -s ours am: 791bb4e9 -s ours am: 53956547 -s ours am: d13cc2bd -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: Iff1793322d315f5de5aa6719e2c9bfbe516dabc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>