Merge "Remove AsyncChannel usage in NsdManager" am: 16d3da63f7

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

Change-Id: I06087e1d4828f4fee7a1b9a42e8bb2596e22684c
tree: 165f4247e06f49ca4ce045b4b6eaa6fed103f022
  1. core/
  2. services/