[automerger skipped] Make resolverOptions optional in DnsResolver. am:...

[automerger skipped] Make resolverOptions optional in DnsResolver. am: cb206f26 -s ours am: c2e4e0ab -s ours

am skip reason: Merged-In I42a07d2bad1b3ee0e66e3f4e2a0f068686e1d1a3 with SHA-1 5322e039 is already in history

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

Change-Id: I5f48421635c71779fd44c5414e682ea2dab0c478