Merge "Do not immediately send new queries on cache hit" am: 4bcc151bf4 am: 30308da2f1

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

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