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

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

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