[automerger skipped] Prevent disconnecting admin-configured VPN am: 735a216da3
am: 18c04f023a
-s ours am: 4350fa4c78
-s ours
am skip reason: skip tag Change-Id Id59d2ac2782e83601bc3093d3a092faea36ff5d9 with SHA-1 735a216da3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13931528
Change-Id: If9f0bf0e9639e636dd31bdd7352d0ac5b450063f
This commit is contained in: