Merge "Remove VpnType usage in VpnTransportInfo" am: e7ea40527a am: b13973838a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f83eb73ce787fd8d8c577deeaced9e6a8d1a117