[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for...

[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: 8d1ed52e -s ours am: fc42296e -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: If2922519093ac72b066ff5cd428af7fb75446a58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>