[automerger skipped] Make resolverOptions in ResolverParamsParcel nullable and...

[automerger skipped] Make resolverOptions in ResolverParamsParcel nullable and add a new IPC setResolverOption am: 6788bee1 am: 20cd970b -s ours am: 65c72fba -s ours

am skip reason: Merged-In I81f4b12dbb06783b72883572926b2e423220a9f7 with SHA-1 87208e25 is already in history

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

Change-Id: I5617bbc19d06bdcd5cb239d0e27a6d1b0f64beef