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

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

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