Merge changes from topic "cherrypicker-L79500000960657219:N07500001368857425" into udc-dev

* changes:
  Implement proper subtype advertising
  Implement proper discovery with subtypes
  Remove the ServiceTypeClient after socket destroyed