Merge "Fix NetworkPolicyManagerService deadlock"