Merge "Add delay to deflake mainline tests" am: d3d64202 am: c051c27f am: 065e224f

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



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