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