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

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

Change-Id: I9bf0d43bfaf1e1621a7ba2fbb251fc9a71ed5b78