Merge "[Cronet] Add setDnsOptionsTest" am: 3b67313159 am: c3c8a7ed2d

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

Change-Id: I1a22be6e632e4b1b7e79528f8b9ba4207fa3d94d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>