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

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



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