Merge "Test MOBIKE trigged while VPN data stall" am: 98a35775cd

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

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