Merge "Move QueryTaskConfig to a standalone class" into main am: 4525688b2d am: 19b022a3ee

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

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