[automerger skipped] Add a resolver option to enforce AID_DNS on query am:...

[automerger skipped] Add a resolver option to enforce AID_DNS on query am: 85fb9ea5 -s ours am: 05b0a722 -s ours am: ad5b0a32 -s ours am: 8a226982 -s ours am: 77c6485e -s ours

am skip reason: Change-Id Iada5d850d8bb9d7b0ad46f5c28a1fff22c7d11a6 with SHA-1 85fb9ea5 is in history

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

Change-Id: I95bac7f2b02a529ab3cd743c5c20fcd7af619ba9