Merge "Do not restart tethering while enabling tethering." into pi-dev
am: f8f459a2cc

Change-Id: I3c231f32255399bf410d32f0b1f55d7ed024c165