[automerger skipped] Fix leak of DhcpServer on tethering stop error am: c0fd05cf73 am: 24d4bdc569 -s ours
am: cd13832b65 -s ours
am skip reason: change_id Ie73481e8d91ce43e4939f8c31a9ce431e382c6d9 with SHA1 fe1ad3d0b8 is in history

Change-Id: I66063168797465c2ed16ff3e0fbdc6137bc203e3