Merge "Keep the native mdns daemon alive for pre-S application" into sc-dev am: 5978eb6e am: a251e5a9 am: 655d9e3e

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

Change-Id: I4a7028b7c1ec43d30d0adbdd97e5071751c02aa0