Merge "Keep the native mdns daemon alive for pre-S application" am: 2adba7dd am: 2c500e21 am: ecd74849 am: 5eea9d8d

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

Change-Id: If445feba49f20bd0f22356e96d1b55548b082576