Merge "Add service type clients to servicediscovery dumpsys" into main am: a87aef36

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



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