Merge "Add DNS query type constants to NetworkStackConstants" into main