[automerger skipped] Merge "Remove InterruptedException from NsdService#create" am: 65a00a1fa5 -s ours am: ac518912e6 -s ours

am skip reason: Merged-In I1d0b973f9dac0f1d4f9d4d03faef66f05edde3fc with SHA-1 71251ed50b is already in history

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

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