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

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

Change-Id: Ic9eac7c83475217002d33e6e7fe83223d795b4f6