Merge "Refactored NetworkPolicyManagerService mUidRules." into nyc-dev