Merge "Update the QueryTaskConfig constructor" into main am: 6ade6e2042 am: cac5292afb

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

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