Merge "Always stop dhcp server even it is obsolete" am: 0ae446b50d am: d2ca7e8b1e am: 136c4f98b4 am: 631cb3dcc8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370217

Change-Id: I434a17c5f41aed0b7f40cc5d23f6c6c0999d3fa5