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

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



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