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

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

Change-Id: Ib65cdc3ebbde42c2ba68880b2895b0bc3db5c022