Merge "DNS64: return both synthesized IPv6 address and queried IPv4 address"...

Merge "DNS64: return both synthesized IPv6 address and queried IPv4 address" am: cf0cfcb3 am: 8d716224

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



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