Merge "Add new test for swtiching multiple upstream network." am: cd893e0825

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

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