Merge "Use assumeTrue in VpnTest" am: b209f64b3c am: 380f661278 am: e4fc4cf7f0

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

Change-Id: I1894f8430831cf1b2169a69fc874480471437ed8