Merge "Refactor query delay calculations" into main am: 3e9d905bb6

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

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