Merge "Add multi-subtype support to NsdService" into main