Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev