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

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

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