[automerger skipped] Merge "DO NOT MERGE: Remove InterruptedException from stub NsdService#create" into sc-mainline-prod am: ed78f6490c -s ours

am skip reason: subject contains skip directive

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

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