Merge "Move the VPN code out of packages/Connectivity." am: 0deca84bb6 am: 67cac09b89 am: f684b8d431

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0acb8b9e93f839986aa6580832f1cdab12b3baf2
tree: b0592548cb8f199134fea7494aa6a76a233cc409
  1. framework/
  2. service/
  3. OWNERS