Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS"