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

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

Change-Id: I69c6326b7c17e777170c8012383d1c5c13971566