tree cd85813fd19247c5e0cf946353dcc1ae05aab7ae
parent dbd031a46fd44e82576a9701c2a6b130313e1eea
parent 29302ad638bad1357cb8b6464bde779e10c4333f
author Treehugger Robot <treehugger-gerrit@google.com> 1612874711 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612874711 +0000

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