Merge "Use assumeTrue in VpnTest" am: b209f64b3c am: 5abf889190

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

Change-Id: Id7e88abf29ac24a1c93bca65552fa55ffa02d2b3