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

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

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