Merge "Allow any caller with CONTROL_VPN to disconnect existing VPN" am: 6460d464c3 am: 2cb4db028b

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

Change-Id: Ia93b2ba5d0dfe672f8dba50f2537ba069069b642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>