Merge "Deflake testStartStopVpnProfileV6 and testStartStopVpnProfileV4" am: b458c41700 am: 5348b24f7d

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

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