Merge "Keep the native mdns daemon alive for pre-S application" am: 2adba7dd4a

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

Change-Id: Id0f1e097c9903897a35846e0ec6026d29228a39a