Merge "Remove "Add skip_4a_query_on_v6_linklocal_addr flag"" into main am:...

Merge "Remove "Add skip_4a_query_on_v6_linklocal_addr flag"" into main am: b333a4b9 am: 7eb9028f

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



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