Merge "Support enable/disable dns forwarding of dnsmasq"
am: 9fedafaf24

Change-Id: Ic3b2ad037be80ff4ad3d3a7d08283c8d2177120c