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

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

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