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

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



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