Merge "Switch Settings from IConnectivityManager to VpnManager." am: ace5a90870 am: 29302ad638

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574947

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71456415072c95cbb7a91f0538d0c07d323ec612