Merge "Set vpn bypassability into VpnTransportInfo" am: 25b16b3d99

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

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