Merge "Use new VpnTransportInfo constructor" am: 0adb9137a2

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

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