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

Change-Id: I85c715b4fe213d83e4d31140b0e39bed426226d0