Merge "Re-enable NetworkPolicyManagerServiceTest."