tree 77f2bd10a46fd2239c83e16a24cf1947609c74c8
parent ce981df31489117394b8a5bffa385c6cf93677c1
parent cbbacff29fda4358f2c53ceea5d7aeec34f21f21
author Mark Chien <markchien@google.com> 1596001962 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596001962 +0000

Merge "Always stop dhcp server even it is obsolete" am: 0ae446b50d am: 4f671f3834 am: 17cfe5d843 am: 9125d2ed58 am: cbbacff29f

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

Change-Id: I1ef0d35da436cc283ddc57daf5d8ec29f11db999