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

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

Change-Id: I2aa5666f1ab0ff035aefc800065fededc81e4517