Merge "Merge "Don't reset user VPN without reason" into sc-dev am: c0115519f6 am: b45b862d36" into sc-v2-dev-plus-aosp am: d6a678d016
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14717702 Change-Id: I128e203d7685ba6dc889f466ed374e9ed2af7071
This commit is contained in: