Merge "Keep the native mdns daemon alive for pre-S application" into sc-dev am: 5978eb6eb4

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

Change-Id: I385be9019608d8bef55fd9fbb4d3187c5943c812