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

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

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