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: c1f46b3e am: eda36b5b

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



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