Merge "Fix logs in NetworkPolicyManagerService." into tm-dev