Merge "Keep the native mdns daemon alive for pre-S application" am: 5e2f17f209 am: e0106f0acd am: 8facf2115d

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

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