Merge "Fix a test bug that doesn't restart network when using experiment flag"...

Merge "Fix a test bug that doesn't restart network when using experiment flag" am: 62978a84 am: af3b511d am: dda760ab am: aaab041d am: dc59059e am: cf03de7e

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

Change-Id: I4cfd442b4c9e783f414506131b6c414b9049233c