Merge "Remove AsyncChannel usage in NsdManager" am: d627d9b1ba am: f62d2629ce

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

Change-Id: I9a83de60e0ff61c0cc41daba65568c944f15d7f7