Merge "Add delay to deflake mainline tests" am: d3d64202 am: 6a87d571

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



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