Merge "Use a delayed message to schedule the query task" into main am: 8abd1be521 am: 9a5085934e am: c1e5a7217f

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

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