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

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

Change-Id: Iea6b0a7e9c1299fe3ae27371375c5086c8169901