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

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

Change-Id: I054e294cb32c0abf70e3ea419db09a2e492e3bc5