Merge "DO NOT MERGE: Remove InterruptedException from stub NsdService#create" into sc-mainline-prod