Merge "Fix NPE in NetworkPolicyLogger.networkBlocked()."