Merge "Merge "Copy isBypassable flag from VpnProfile to VpnConfig" am:...

Merge "Merge "Copy isBypassable flag from VpnProfile to VpnConfig" am: 32b24365 am: 8048f8bb am: ffda7e44" into tm-d1-dev-plus-aosp am: 1378c0d2 am: 80cca041

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



Change-Id: Iacf70a98f3711f24ee25c5b3ffff14488095d37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>