Merge "Add test for setConnectionMigration options" am: 2639f1d2fe

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

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