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

Change-Id: I63f7dfd8be24577b1f1931ff2fea24b3a2b1b8aa