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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2c66e0c97bc383237782f6116398b225c26e3ea
tree: 1f132ca15fbff01cd2e2e2313db3a181999b77d5
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS