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

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

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