Merge "Move the VPN code out of packages/Connectivity." am: 125297acbf am: a4bb1e5c84 am: 8ff1082757

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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