Merge "Remove VpnType usage in VpnTransportInfo" am: 8828fc0b65

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41431bfba97a6fe0678b9a5dc72b19479d5d4c66
tree: 9aac3f58ae12198c17cda278d0e6d962a87f87f5
  1. framework/
  2. service/
  3. OWNERS