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

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

Change-Id: Icb73c93454669e198b557ca13432cb93ff88256a