Merge "Refactor updating rules for all apps in NetworkPolicyManagerService"