Merge "Keep the native mdns daemon alive for pre-S application" am: 2adba7dd4a am: 2c500e21bd

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

Change-Id: I0312c8abb2eb11d8f788ca915a13ba0f23b5430a