Merge "Fix NetworkPolicyManagerServiceTest."