Merge "dnsresolver_aidl: use versions for imports" am: 54e53fd9 am:...

Merge "dnsresolver_aidl: use versions for imports" am: 54e53fd9 am: 8b2ea2a0 am: 23964d58 am: 33fc4d7c

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

Change-Id: If982029eeb78892f868b291eb77f4c2187b05c6b