[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 am: 244fa304 -s ours am: afe86f9a -s ours am: e7c07d50 -s ours

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

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

Change-Id: I3b7bf85a2f9c033ed1015d765dcafb833485de05