Merge "Add CTS for DnsOptions API" am: 6436cc10e0 am: 6734aef123

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

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