[automerger skipped] Merge "Use dns resolver v9 in connectivity and set resolverOptions to null." into sc-dev am: 4e257a92ca -s ours

am skip reason: Merged-In I310a79521f5a365e50e2c65e9dd87d9b68f105d7 with SHA-1 30bebea049 is already in history

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

Change-Id: I0bf4cd33d15002e48a0eeb77d7701e52f6d7a285