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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6c73f67cc7e81025d8c55a437ada9ba4fce34ca