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

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

Change-Id: Id45ad3c4bcc90fc3b8355428f8b5d131b220470e