Merge "Don't reset user VPN without reason" into sc-dev am: c0115519 am: 0365d285 am: e20f6486

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

Change-Id: Iaf24599ebf21b051e66adb3ba9d20e37fac60273