Merge "Remove VpnType usage in VpnTransportInfo" am: 3ce3d9f33d am: 6d573604b0 am: 2fb1c6649c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2c66e0c97bc383237782f6116398b225c26e3ea