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

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552 am: 95d21bc1 -s ours am: 18c00007 -s ours am: 8e637809 -s ours am: 312065af -s ours am: 91a79657 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386



Change-Id: Iaeab1cb23701e7b236ff376d22984d8d894624ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>