Merge "Remove VpnType usage in VpnTransportInfo" am: 8828fc0b65 am: 59ad107b0f am: 2fb1c6649c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2c66e0c97bc383237782f6116398b225c26e3ea
tree: d887eead4912bccc9a2093dde4bceabf109f2045
  1. framework/
  2. service/
  3. OWNERS