Merge "Improve error message for doTestContinuousQueries" into main am: ab2126187c am: d56b35e004

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

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