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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa46f6685b840a5993f86e1856f1e35c5726f0fd