Merge "Pass the socket mark for DNS queries to dnsmasq." into lmp-dev