Merge "Merge "Test: Update DnsTlsFrontend query counter before send DNS...

Merge "Merge "Test: Update DnsTlsFrontend query counter before send DNS answers" am: eae5d779 am: 2e53ad23 am: cfbbb028 am: d85fe63e am: 8af8605d" am: 969b7135 am: 25d6d224

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



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