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

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

Change-Id: I03024cb93ea05cccb7ec43a19c3430ef20637eeb
tree: ea922035fa42e6f8ff3605998269c22422b31087
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING