Merge "Use an integer for query mode" into main am: 22827c3814

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

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