Merge "Use dns resolver v9 in connectivity and set resolverOptions to null." am: d4c0d59179

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

Change-Id: I4fc4579247497a74489b028b040da2425415a312