Merge "Add aggressive query mode" into main am: b4fba147cd am: 1a5b7f88c3

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

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