Merge "Keep the native mdns daemon alive for pre-S application" am: b2d3a48ae8 am: 67584fa3fe

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

Change-Id: I0312c8abb2eb11d8f788ca915a13ba0f23b5430a
tree: 14a8728963df89ea2c20d106ef63290913f3fa3d
  1. core/
  2. services/