Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev