Merge "Enable DNS resolver tests to be included in android-mts-dnsresolver as...

Merge "Enable DNS resolver tests to be included in android-mts-dnsresolver as well as android-mts." am: 228a3c88 am: 927d622f am: 7b81cb8c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc09cd0a6c95a298c7c3743d83ef50ac0c72b062