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

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

Change-Id: Ib6e173d0b68469d596cf8491b729d50ed1f5263a