Merge "Add test for [set|is]BypassableVpn" am: 3fbec7cf77 am: 2d4f82f0cf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676426

Change-Id: I03024cb93ea05cccb7ec43a19c3430ef20637eeb