Merge "Support enable/disable dns forwarding of dnsmasq when start tethering" am: 6fecb94292
am: a3ddee80fd

Change-Id: If5a280508dcc95df911d1d72671857a8c58bbbd4