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

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

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