Merge "Update NSD tests without AsyncChannel" am: 469d941752 am: b7fd5bd3e1

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1823893

Change-Id: I0b0dcad8e790d0e1f7a37aa27bd778e9ec4fd297