Merge "Use new VpnTransportInfo constructor" am: 0adb9137a2 am: b6b6f6b1b2

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

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