Merge "Add Restricted Mode handling to NetworkPolicyManager"