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

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

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