Merge "Add skip_4a_query_on_v6_linklocal_addr flag" am: 2f40edc2 am: d5f6f0dc am: d9f8c27f

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



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