Merge "Don't reset user VPN without reason" into sc-dev am: c0115519f6 am: 0365d2850a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14717702

Change-Id: Ib9ab0beded05be8b92cdb5db55ac556387db0e89