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

Change-Id: I1336a04e1a7b1655354f4d3d4b93897e2db4fdbe