Merge "[Test] Fix DNS resolver MTS failures" into main am: bf1f867ce6 am: ca9badbf6c

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

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