tree 89d5b76feff690d88a0cf3da34185d07c1dff552
parent 5c5b36f19d85a9446eb89f9f2409e5cb7c0c4683
parent ace5a90870386a6efb24c324b1f76a3526f61567
author Treehugger Robot <treehugger-gerrit@google.com> 1612873318 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612873318 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d050875038408172e538290a53d10306d986578