Merge "Add test for [set|is]BypassableVpn" am: 3fbec7cf77 am: 7f7769b82e am: dc05bc9aa7

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

Change-Id: Ib65cdc3ebbde42c2ba68880b2895b0bc3db5c022
tree: ed59534c27c4a11cc8b9acb0c10f44f00ef35539
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING