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

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

Change-Id: I366e094021411bf6427e37db1da2cccc22cf6008