Merge "Deflake testStartStopVpnProfileV6 and testStartStopVpnProfileV4" am: b458c41700 am: 49451077aa

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

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