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 am: bb72519f am: b8e55770

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



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