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

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

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



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