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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44a9b9dd67604f7f5275bb0ceeea1be41d9e587a