Merge "Move the VPN code out of packages/Connectivity." am: 8269d21dec am: 6011d5240c am: f684b8d431

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0acb8b9e93f839986aa6580832f1cdab12b3baf2