Merge "Use the ServiceTypeClient network for queries" am: 401ab44c36

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

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