Merge "Switch VpnDialogs from IConnectivityManager to IVpnManager." am: dbe68e90d7 am: 68bf6fa1bb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I531092f442268da8396c7619b6f8acc05f6724a4