Merge "Remove InterruptedException from NsdService#create" am: 65a00a1fa5 am: 7dc4b9a812

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

Change-Id: I4a196eadd858e701cfb154cc1c25e370a4575b35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>